Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Passing cluster-name as a string in the fluentbit daemon-set #87

Merged
merged 2 commits into from
Feb 28, 2024
Merged

Passing cluster-name as a string in the fluentbit daemon-set #87

merged 2 commits into from
Feb 28, 2024

Conversation

mitali-salvi
Copy link
Contributor

Description of changes:
Fixing cluster-name as a string to accomodate numeric only strings in fluentbit daemonset

helm template --namespace testing -s templates/fluent-bit-daemonset.yaml ./helm --set region=us-east-1 
---
# Source: amazon-cloudwatch-observability/templates/fluent-bit-daemonset.yaml
apiVersion: apps/v1
kind: DaemonSet
metadata:
  name: fluent-bit
  namespace: testing
  labels:
    k8s-app: fluent-bit
    version: v1
    kubernetes.io/cluster-service: "true"
spec:
  selector:
    matchLabels:
      k8s-app: fluent-bit
  template:
    metadata:
      annotations:
        checksum/config: e75de7fae063d5317a3c8b7d93f6ee013203d395f89be449d36f3f406b20f837
      labels:
        k8s-app: fluent-bit
        version: v1
        kubernetes.io/cluster-service: "true"
    spec:
      containers:
      - name: fluent-bit
        image: public.ecr.aws/aws-observability/aws-for-fluent-bit:2.31.12.20230911
        imagePullPolicy: Always
        env:
        - name: AWS_REGION
          value: us-east-1
        - name: CLUSTER_NAME
          value: "k8s-cluster-90b19a1"

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@mitali-salvi mitali-salvi self-assigned this Feb 12, 2024
sky333999
sky333999 reviewed Feb 28, 2024
View reviewed changes
helm/templates/cloudwatch-agent-daemonset.yaml
{{- else }}
config: {{ template "cloudwatch-agent.modify-default-config" . }}
config: {{ include "cloudwatch-agent.modify-config" (merge (dict "Config" .Values.agent.defaultConfig) . ) }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just double checking, this dict with the Config key is just to access it in the func and wont actually exist in the final output of this right?

@mitali-salvi mitali-salvi merged commit 10179a5 into main Feb 28, 2024
4 checks passed
@mitali-salvi mitali-salvi deleted the fluentd-cluster-name branch February 28, 2024 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@movence movence movence approved these changes

@sky333999 sky333999 sky333999 approved these changes

Assignees

@mitali-salvi mitali-salvi

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mitali-salvi @movence @sky333999